diff --git a/cpu/pxa/usb.c b/cpu/pxa/usb.c
index 4ef3ac7..65f457f 100644
--- a/cpu/pxa/usb.c
+++ b/cpu/pxa/usb.c
@@ -40,12 +40,9 @@
 	CKEN |= CKEN10_USBHOST;
 #endif
 
+#if defined(CONFIG_CPU_MONAHANS)
 	/* Configure Port 2 for Host (USB Client Registers) */
 	UP2OCR = 0x3000c;
-
-#if 0
-	GPIO2_2 = 0x801; /* USBHPEN - Alt. Fkt. 1 */
-	GPIO3_2 = 0x801; /* USBHPWR - Alt. Fkt. 1 */
 #endif
 
 	UHCHR |= UHCHR_FHR;
@@ -56,11 +53,6 @@
 	while (UHCHR & UHCHR_FSBIR)
 		udelay(1);
 
-#if 0
-	UHCHR |= UHCHR_PCPL; /* USBHPEN is active low */
-	UHCHR |= UHCHR_PSPL; /* USBHPWR is active low */
-#endif
-
 #if defined(CONFIG_CPU_MONAHANS)
 	UHCHR &= ~UHCHR_SSEP0;
 #endif
@@ -75,8 +67,6 @@
 
 int usb_cpu_stop()
 {
-	/* may not want to do this */
-	/* CKENA &= ~(CKENA_2_USBHOST |  CKENA_20_UDC); */
 	return 0;
 }